From db97a29be52d2a9d6ac096fd12783976cca45b2b Mon Sep 17 00:00:00 2001 From: justbur Date: Mon, 30 Nov 2015 20:58:48 -0500 Subject: [PATCH] Cleanup make-text-button call --- which-key.el | 38 ++++++++++++++++++-------------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/which-key.el b/which-key.el index 04bc4ef9a46..57f475368cd 100644 --- a/which-key.el +++ b/which-key.el @@ -1218,26 +1218,24 @@ ORIGINAL-DESCRIPTION is the description given by (substring desc 6) desc)) (desc (if group (concat "+" desc) desc)) (desc (which-key--truncate-description desc))) - (eval - `(make-text-button - ,desc nil - 'face ',(cond (hl-face hl-face) - (group 'which-key-group-description-face) - (local 'which-key-local-map-description-face) - (t 'which-key-command-description-face)) - 'help-echo ,(cond - ((and (fboundp (intern original-description)) - (documentation (intern original-description)) - tooltip-mode) - (documentation (intern original-description))) - ((and (fboundp (intern original-description)) - (documentation (intern original-description)) - (let* ((doc (documentation (intern original-description))) - (str (replace-regexp-in-string "\n" " " doc)) - (max (floor (* (frame-width) 0.8)))) - (if (> (length str) max) - (concat (substring str 0 max) "...") - str))))))) + (make-text-button desc nil + 'face (cond (hl-face hl-face) + (group 'which-key-group-description-face) + (local 'which-key-local-map-description-face) + (t 'which-key-command-description-face)) + 'help-echo (cond + ((and (fboundp (intern original-description)) + (documentation (intern original-description)) + tooltip-mode) + (documentation (intern original-description))) + ((and (fboundp (intern original-description)) + (documentation (intern original-description)) + (let* ((doc (documentation (intern original-description))) + (str (replace-regexp-in-string "\n" " " doc)) + (max (floor (* (frame-width) 0.8)))) + (if (> (length str) max) + (concat (substring str 0 max) "...") + str)))))) desc)) (defun which-key--format-and-replace (unformatted) -- 2.30.2